projects / xen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 11cf6ff bec85fb)
bitkeeper revision 1.1159.212.22 (41ee20131dSkJwS4ElWa61syAlMc-g)
authorkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Wed, 19 Jan 2005 08:53:39 +0000 (08:53 +0000)
committerkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Wed, 19 Jan 2005 08:53:39 +0000 (08:53 +0000)
Merge scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk

1  2 
xen/common/dom0_ops.c patch | diff1 | diff2 | blob | history
xen/common/page_alloc.c patch | diff1 | diff2 | blob | history

diff --cc xen/common/dom0_ops.c
Simple merge
diff --cc xen/common/page_alloc.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.